Fixed errors, new Default class can be used for databases now