Major changes to follow store implementation.