Extended database now working