Troia 1.2

Key Value Storage
API consolidation
fixes