Database mac compatibility added and extended