Added Class

- Minor refactoring