Several improvements for Entities
Fixed prototype services