- improve static property handling