Handle primitive and array types for bundle

See #75.