Adding entity definitions and fixtures