Added helpers
Fixed helper