Using now the library instead of own classes.