Add module and match boilerplate