Fix for stub to match current structure