Small update to make things common