Rearranged namespaces and timestamp is passed as a parameter now