FE :: Architecture improvements