Divide helper methods and support latest api