Adding basic array datatypes. Refactoring.