Replace static helper methods