Refactored some of the meta definitions.