Added custom logging support