Updated to match recent changes