Updated Entity API to 7.x-1.0