Refactored postage lib