IDB-010 First commit in second sprint