Change design of theory (not functionnal yet)