Add scalar types

Fix #1