Refactored password type
Added choice type