Data Classes and some small additions