temp refactoring for Fwk/Core