more changes to work with druid