Restructure: Post API fixes.