XD-1459: Insulate module from Environment