Added management features