Added more fields

Signed-off-by: z0c <nvnivs@gmail.com>