+ Implemented new operations
+ Considerable refactoring