Updated Files for default constructors and fixed null exceptions