Updates to ember models and schema