Continue implementation of the Static Refactoring