Adapted external changeset
Implemented dummy objects to avoid null pointers and null checks