Added properties for better syntax