Added a few more properties