Fixing unflitered api and adding logging