updated schema with proper builders (i think)