added basic parsing features