Added some additional helpers
Fixed