Total, Ravenol. DB refactor