Updated features + datatypes