Follow existing patterns more closely