Added more helpers and refactoring