Add features to fix travis build