Edited constructors and variables to match database