Changed structure, added prior/post definitions.