Added @its:version and extensibility workaround