Adding some notes and configuring data source