Added properties and selection handling