Refined some parts of the specification