Refactored to allow loading interfaces & traits. Check CHANGELOG.md