Improvement/maintenance 3/improved aws logging