Multi support, renamed helper, added todos