Improved defaults and refactored usage of post_id