SAMI helper class tweaks