Chore/specs