Database improvements :)