Refactoring of Method signatures and nulls
Changed location of diagram and made it a slice