Modified correct datattypes