Framework Sync and some fix