adding initial set support