Add maker and data source interface