Updated some aspects when writing spec. No things should be more clearer
and unified.