Working on change set manager