Modified module pattern