Removed schema_plus since it's mostly unnecessary