New functionalities
New classes added
Merge