New billing backend part II - Done