Sync with eclipse project