Adding fun parser