Added administration and configuration functionality