Added some preparser code (not integrated)