Added 'expand' to exported functions