Ready for new ScrAPI/new schema