Added membership type and RAKAT expiry fields
Rearranged athlete fields