Improve FE architecture