Added all models common to FL and ODL for the core functionality