Updated Entity module to have server api field