Added a few extra neccesary fields