Added initial post handling