More work on crypto consumers
Restructure
Redifine Service callbacks