refactoring to support Fedora Beta 4