Updated to automatically include packages