Added new classes to the engine.

Signed-off-by: Arindam Biswas <ari.b.2015@gmail.com>
Merge remote-tracking branch 'origin/master'