Fix samples import and minor design improvement