Refactored project sync