Javifurlan/80161676 modified database