Cleanup
New feature : possibly use multiple contenthandlers