Add user implemented

Some minor changes