Explicitly pass hbsfy options
Updates and es6