Fixed DB handler class