[IMPROVEMENT] Add a few helpers