Updated implementation to match system components.