move to core namespace