Remove booleans from api and Store creation as long
Merge branch 'remove-boolean-from-api'