Added reference module and masquerade