Included suggestions from e-Contract