Added cancan and user fields