Added user validation and onbuild commands