Removed AWS credentials + more Events functionality