and added support for tailor for the following