Added missing properties and import

Issues found by unittests