- Added "list func" support
- Fix conflict