Stricter validation for queue
#15 - DRY up sync.create