Work in progress to add sync support