update class structure
add db parser