Refactored, renamed and added Not implemented messages