Add the options in the correct order
Add entities