Metadata model update
	Refactoring model specs to use factories.