Some platform services refactoring