Upgraded properties
Fixed exceptino not found