Refactored once again the handling of properties / interface objects.