EOSFactory v2.1 compatibility update + requested features