Refactoring in order to be WordPress VIP ready