Made parser pluggable, related to #7