Modified Generate billing functionality