[ADD] Some more database handler stuff