Little API improvements by client request
No need to keep that line