Removed explicit packages in template