Minor changes - just before adding database