Added new class
Merge from development