Added traits/interface support