Updated properties a bit