Also use internal logging macros here?