issue_2 - Including support for OLX