Slots implementation and annotation finished. Slight changes in naming.