[IMPROVEMENT] add entities