Replace static type field with dinamic evaluation

Just to make instantiation simpler
...and fix some issues in MFB FE ;)