Adding database modeling (not completed)