YH-333: Changed default organization implementation and service database configuration