Add terraform; simplify