Adding comments and preconditions