Added domain objects and fixtures