Added more helpers