DB Design Updated