Add and cancel now working with new schema