OSNG-10 added distribution management and UserController