added database2 and cgi DB. and the next is rebuild models