Added username and some checks