Updated models, New created Choices lib