Move the condition into the fw class to avoid issues with dependencies in base