Added timestamps and current user