Added properties logic