Improve: Entity template > Easier to implement