Little refactoring of framework package