timestamp as Date instead of String
removing xmlns:stub & xmlns:custom
other small formattings