Adding entity definitions