Some more changes + some internal classes using el::Loggable