Added new database elements, implementation logic for T2