Set import to only needed imports rather than * - minor fix to initial setup