Code review
Added new properties