Fixed bugs
Added Users class