Improved data notation.
Improved error detection and replaced Optional.