Resolves Map/Buffer redundency