Added current_user methods