Add more helpers and helper methods