Goal Db and mainclass changes