Bugs fixed
Added helper support