Minor helper have been added.