Added user validation and bootstrap