Added cleaner validation, and the beginnings of property alias values