Add return value to handler methods