improved camel/other things support