Try to add some module support :p