Add new requests and improve modularity