Commit all so far
Add options bind and update addHelper method