added prefix to type
prefixed types handling
additional set tests