Remove import * and add a common base so foreign keys work