slight changes in function dispatcher and property map, mostly optimization a safety changes