Uses more lib mixins thus fixes #4