Fixed split bug + updated DB schema