Complete re-work to make like rax plugin