Improve type conversion & add support for static