Adding properties capability, fix datasource provider.