Decoupled some stasm related stuff