Adding more logic for how data should work