Added: composition, singleton