Fixed: Added Time field and tests