PS-10: Fixed editing and displaying data schema