Removed values from contrib and added into core as vals