Adding Uniquene constraint on container names and other small fixes