ECLIPSE-1079 - work to make api more suitable for fuseide to use.