Added database goodness
resolve app conflict