Added checking for isset values on add