Add support for addition
Fix time assignment