Update implementation method order to match the header