Feature:
More compatibility with new types