little ajusts in Entry Model and Template