added proper package scan