Functionality is now not dependent on Draper