Raise error if result is not found or is invalid
Fix invalid attributes list
Reorganize methods definition