I like this and I have been meaning to fix this a looong time :) 
I guess you have to make sure that the capabilities for the Database is added from the datasource, so that it is as compatible as possible?