Split data and user features
Add redirect step