More parsing logic