Added NonTransactional and related classes