some changes to make the management interface more epandable