Added documentation.
Made timestamp a composite class.