Adding manual transaction feature to new infrastructure