Merged some parsing stuff