Added some feedback + testing of regular schema we plan to use