Added Entity class
Enabled cursor by default