Changed IP addr and compiliance with PSR-2