Moved this to the module (attach)