added more fields to manage