[IMP] improved snippet according to new structure