Fix Time API

Fix Time API