Updated to match interfaces