Adding more helpers for other modules