Add all necessary properties