property_handler updated so to make it compatible with sunction signature