Improved Post mapping