Jf/dyn improvements