Fixed params, added logging support