Adjust of HAfAH implementation to fit new SQL interface