Reworked imports slightly