Add few improvements in OpenLine