Assignment 7 - DB support added