[PRX-89] refactoring of non-configuration objects