Update for private usage and test