Changes from development
Added a few properties and functions