Revisited for better Redhat familly support