added Management functionality