Initial commit for hot billing preparation