Added entityResource + entity mocks