Add watch and dev aggregation