Added persistence and transaction management