Added necessary properties