Changed specs as per CR changes