Fixed parser still depending on old library entities