database and analysis modules added