Added base functinality. Recreated message/data in dedicated class/object