Improved helper. Added trait. Added tests.