Reduce namespace polution