Changing implementation

Adding Static class.