Add extra helper methods + extra consts