Improved work import