refactor ose-1.2 framework