Added some manangement functionality