Refactored  added Set Class