Module pattern added