Let's clean this up for direct import