Setup management (24/28)

Setup management