Add logging and first classes