Refactoring - removed unnecessary fwk library to avoid conflicts