Added basic logging support