Added to functional specs