Properly create new cells based on their type