Added Properties functionality