Common logic update