Type droplet entity
Cleanup annotations