new stucture as of 1.5.1