Switched to new _type style, improved source value check
1.1.0