Updates to integration with Ricardo