Library adjustments

Add some changes based on first integration test