Updated code to include properties