Insert refactoring: FIx Issue: Issue #15