Stubs and SQL added