Fixed errors in regards to implementing base struct