added additional properties to minimize code