Add entity names
Add android type compliance