Some changes to make it work in production + AWS added