Trying to integrate with structure of MS implementation