Added user login etc..