Support for API, test cases, timeout, CS keys, involves migration changes