Add experimental implementation for expand