adding sync support