Adjust API and add specs
Merge branch 'SP-390' into dev