Another attempt to not to include unnecessary files