Improved add/remove field for schemas