* Return Castable class if failed to detect it from return types * fix-style * Add CHANGELOG.md entry