Edited some database handling in INIT application