Add support for multiple entries in BASE_SYNC