Added logging and base components