Update after refatoring