adding database support and machines e2e scenario