Change Member namespace to make it optional