Added @its:version, better handling of extensibility