added some generic types and adjust primary key
added some generic types and adjust primary key

primary key isn't finalized. Just added some fields. Need to play with that more.
HolmesProcessing/Holmes-Storage