refactored to liquid/3.x database structure