Refactoring of 1.0 in progress