Adjust transcation support and return values