Added custom repositories to isolate SQL queries