Added property edit functionality