Database systems are an important component of most undergraduate computer science programs. The field is expanding rapidly, making it challenging to offer sufficient coverage of database concepts in an introductory course. This project is building on a successful proof-of-concept CCLI grant, which led to the development of courseware to support the teaching of essential database topics (http://coffee.kennesaw.edu). This project extends the original courseware by 1) refining and expanding existing animations in the area of Database Design, SQL, and Transactional Processing, 2) developing a standardized interface for all courseware modules, 3) adding modules in complex topics such as security, XML, Data Warehousing, database tuning and database architecture, 4) developing an evaluation component with student feedback and 5) developing ancillary materials to support the incorporation of the ADbC into the classroom and into popular database textbooks.