Add ContentType, small refactor on ContentTypeGroup