Return types maonly converted to boolean and expcetions added