Added keyspacebuilder package