Starting to rework to a more GeMTC agnostic approach