Fixing model to have more options