Implement missing methods
Fix isComplete method
Remove the async path through the default servlet