Added properties to entities