Major refactoring because of missing variable replacement for Fedora