Make sure to set all props from schema
Fixed circular dependencies