Fixed some issues in manage and improved models