Added database structure; Made language more uniform