Add Tailor. Resolve Tailor issues.