Improvements to FOE block and adding it into the feature module via Context.