Updated parsing to use inheritance properly
Version bump