Add more local imports