Use faces
Better dmd-query
Update subs