Improves prepare, call_method