Add some logging and rme related stuff