Handled multiple schema add scenarios
Fixes #6