Fixed typo that led to a crash sometimes
Reverted performance optimization due to incorrect behaviour
Interface instances from existing classes can now be defined in XML