Do not pollute with our additional types

closes #1