Adding full parsing of 'by'