More updates and cleanups for new requests