Refactored the admin service; Fixed a bug in eager service