- added UnderConstruction object's state
 - split object's static data