Modified parse method