Completed refactoring designation related code