Add necessary functionality as per test requirements