Actually updated to use supplier instead of custom interface