Add more helper functions
Final touch