Additional post processes & better error handling