Fix dependency
Handle errors. Encapsulate more parameter/result handling.