Removed synchronization check and do not populate unnecessary fields