Soc2014 meta refactor upgrade

Sure. The only thing is that this is only used in 3-4 places. Are we sure we want to create a public API that is already quite extensive by itself?