Bugfix
Simplify data structure, move time into subscribe() method